fixed icons and improved ui