issue #32 keyboard entry and button interaction improved and also
removed unused code from layouts