Progress on bootstrap theme, fixed some spacing