Feat/ui

merging feat/ui to master