UI changes
resolved conflicts