Some visual improvements

Some visual improvements and bug fixes