Updated UI as of 03-08-2013