New ui

Hope this works