Cleaned up Finish page, fixed keys for application