Fixed design bugs
Added user to