Clean up

- Indentation checked
- Bug fixes
Admin template - footer changed