controllers and html fixes