Fix alignment issues and buttons
Add space to the display select box