cleaning up menu, just finshed layout