Improved formatting and fix dropdown menu items