update layout and add a Makefile