Ui fixes: layout refactoring.