Small fixes

Fixed some problems created by the last update and made some styling
changes.