Lots of stuff changed

Lots of stuff changed. Contact me on TopBot (Janca) if you need any help