+ Fix UI
+ clean code