Updated with CSS
Clean up code