Cleaned up & organized code, worked some more on UI