Added icons and base layout is done