Front-end work done on: login/signup/dashboard (.html)
Fix conflits