Implemented counter (WIP) and minor bigfixes
Merged conflicts in basic.scss