Made the menu look better. Cleaning up entities results in less memory leaks.