Change css classes to represent functionality better