Text, layout updates from BugHerd

Comments #11-16 and 18