Continued working on my layout