fixed a couple bugs and css still need to do the popular stuff