Fixed some conflicts, Some changes for UI design
Fixed some conflicts, Some changes for UI design