Major refactoring + Facebook auth + Bug fixes