[MOD] Rework LoginActivity & RegisterActivity
[MOD] Rework LoginActivity & RegisterActivity & merge