Various updates, alignment with bootstrap styles