Improvements on GUI