More UI and flash cards improvements