Converted routes into modals, fixed badges and profile data