Removed support for hardware buttons, added two functions and comments