Small changes in frontend
Resolved merge conflict