09092013a

Layout updates and bug fixes