Refactoring the code so make it better structured and more readable
Fixing the bug for creation activity and top card fragment
Merge pull request #73 from Hawk-It/refactor

Refactor