Implemented loading button and fixed a small service issue.