Cleanup and added control/help menu