fix a bug and do some more styling