Bug fixes

Fixed a few bugs on different pages.