Visual improvements

More visual improvements and fixes.