working on layouts
Resolve all issues