Remove clock and calendar & Fix TAB key management