Controller Layout Bugfix