Fixed some bugs, style changes, javascript functioning now