Restructure menu to avoid overflow on low resolutions
Bug fixes