Did more changes on the GUI client