Visual improvements and Makefile updated