Added painting signifers and small ui changes