Few Bugfixes regardin Styling