Merged changes and added styling.