Develop

[tannakartikey]

• Bug fixes (ajc113/currents#42 - https://github.com/tannakartikey/currents/commit/e385d1677fd88ee7021ddb45dfc5edcd7acf4051)
• Admin side improvements
• Code polishing