Fixed bugs and ready for website