updated and cleaned markup and styles