minor changes
changes in controllers
More resolved conflicts
Minor changes
Resolved merge conflicts
added border radius
border radius