Fix
Small arrangements for the ui