Layout fix and new makefile