Some Bugfixes; fixed layout