Minor layout changes & updated bootstrap