working on icons
work on layouts