changed css & updated ToDO
Merge remote-tracking branch 'origin/fraenzi-branch' into simon-branch
Small bugfix and added order to admin page