Fixed bugs, and restructured website