Updated with CSS and connection vars