Improvements

Some visual and functional improvements.