General markup and style updates