Updated with more default elements, fixed issues with link hover states