Advanced few more steps and improved popup ui