Added layout override and minor bug fixes