Fixed some UI issues with Setting Screen