css cleanup/simplification, bootstrap upgrade