rebuilt using bootstrap, added misc features and bug fixes