Fix various issues as well as styling.