added layout
implemented FindById