Continued to work on layouts