fixes for controller layout