Revert "some changes..."

This reverts commit b137a60501adb7197e0a4d1ab4af0b7da9dbd8de.
Merge branch 'rs-dev' of github.com:yanniks/RowShow-7x30 into rs-dev