Updated description and minor UI fixes