Some edits to work with bootstrap