Minor Visual Issues from the Refactor

Any found issues from the merging of !904 (merged) can be collated here.