BS-8923, several ergonomics improvements