I13: Layout fix and static files fix