many changes in ui to make card, click and entry concept work properly