Minor UI updates and debug lines removal

getting ready for the tri-state checkbox implementation