UI Issues Fixed

UI Issues Fixed