Style error pages and merged master with development.