add makefile, and slight tweak fo layout