Merged design styles, general improvements.