Fixed static content, improved controller