Tweak layout and add Makefile