refactoring code for enum states. Changed names of drawable-titles.