Fix ui layouts
Refactor
Fixup branch mistake