Fixed layout problems in Control view