Bug fixes for button behavior along with additional info on home screen