added layout and libraries