1. Updated the laoout to size the buttons properly. Change-Id: I58f9beeca23af8b0471cf7f7ae9ca717223221aa