Minor bugfixes and added styling