Layout, initial tags, minor bug fix