Improved some styling, fixed some close-popup bugs.