Bootstrap and some formatting

no db changes worth noting...still broken in parts