Prettified design a little bit and added some config options