Merge various aesthetic and functionality improvements