Fixes and bit of UI