Add login, register and edit views
Fix conflict