Clean up and commenting
Home button now works.