Improved markup and updated css accordingly