Some Bugfixes; fixed CSS