Cleaned up markup, modified styles again