removed trash, menu layout