UX fixes as well as api session timeout handling fix