Fix markup and link styling