Fixed alignment of Facebook login
Unified the format of ticket tables
Changes at navbar
Fixed conflicts
Resolving conflicts