Ui clean up
merge fix