updated gui and logic
updated gui and logic