After login fix + UI fixes