try to fix code highlighting in config file, fix layout and change GA code