minor refactor (naming), adding disabling add button code + tests