Changed some markup to improve presentation