merged from controllers with some styles attached