Buggfixed issue #186 + css changes