Fix bug 0006 (When the Search is completed the "Progress bar" should change to say "Done" or similar)

Also removed bug 0007 as it isn't  a bug but an issue which requires
some design changes.