- changed layout
- fixed service