Improved styling, alignment