added viewport and cleaned up menu