Added new class to differ states and other minor changes
Watch last msg, i'am stupid in git ;(