Added labels and improved some UI