Added controllers and test layout