start unit testing + small ui changes