Fixed some style issues - buttons and popups