Added some icons from Canvas and changed layout