Make check button togglable
Separate resources