Cleaned up login page, attempted to implement correct 'next' re-direct