Fixed message parsing
updated todo
Prototype layout of admin-tools