Fix spacing, cleanup code, and add missing div element