Bugfixes & change looks