Minor UI issues resolved