Add controllers and layout