UI tidying / Refactoring