More UI adding/fixing/stuff