Updated with new layout and HTML