Bugfixes, added a bit css styling