CSS'd everything, added bootstrap
merged in CSS changes