some ui changes
commiting conflicts