Added controllers and styling