Aesthetic changes, still working on the SQL backend.