Miscallenous layout edits