Final UI

Code clean