Removed focus code that was used as a substitute to proper selection code, cleaned-up button behaviours.