#11 #12 #15

Layout modified and almost done.