First work on scenarios

Also some design work and fixing the admin