Finally fixing control positioning