small fixes for layout and makefile