Lots of small alignment tweaks to get Bootstrap3 looking better