Major updtes to GUI