Made some frontend changes
Resolved merge conflicts