removed layout dependency