Updated some UI issues