Fixed lots of icons and prettieness