changed workspace layouts
resolved merge conflicts