Moved .gitignore file
Refactorings
Bug fixes
Minor design improvements