Merge perfect
Added some UI