CRATEIT-72: continued UI polishing
CRATEIT-72: fixing merge confilct for add modal