Add layouts and refactor server to Service