cleanup and working on layouts