WIP: Clean up redirection logic and CSS classes