Cleaned up the project mess, added menu page