Cleanup of UI and includes
Makefile install target