Revert "Another commit with many small fixes [Urgent]"
Merge pull request #150 from fossasia/revert-140-master

Revert "Another commit with many small fixes [Urgent]"