UI update

clean project, with UI
-Bo & Max