Added things for home handler layout