Moved some styling out of the layouts and into styles.