Improve the markup to take advantage of bootstrap