fixed a few bugs, added some navigation buttons