NPE fix
redesign and add checkbox
better colors