Initial changes for gummy, fixes home navigation button not working.