Formatting and minor GUI changes.