Slim templating, design improvements incomming