Also, cleaned makefile, less magic strings
Also common modal components can now be nicely separated and reused