Many tweaks, clean ups, and styling