Initial ui
styling
UI polish
resolved conflicts