Changed to singleton layout