Fixed errors and improved some UI details