More gui stuff and updates