Refined styles and miscellaneous bugs