Improved styles and added icons