Changed controller and started new layout design