Remove the custom ui stuff
Remove the custom ui stuff