MBug: Finished merging CSS changes, but it looks a little off.