Further work on website
Completed the app portion (Still need to fix a bug)