Dev

Tested.
Cleaner look.
Hidden in UI mode.