Some UI Changes and regex added