Added user panel
Fixed conflict