Adds style improvements and counter