Fixed styling and initial load bug