Updated look and bugfixes