Apply some of the code tweaks from the boostrap3 work to the main develop branch