Fixed Makefile
Fixed layout.

Window positioning needs to be fixed.