Improved UI Functionality and Makefile