Removed the icons mess
Added some view configuration