Clean up layout of the popup a bit