3.0 Update + Aesthetic Changes