VArious fixes to make the application look better

We are now left with the "real" stuff to make it work