finishing touches

Fixed some last minute bugs and UI issues.