Fixed conflict.
Cleaned resource folder.
Login prepartions