Some updates for GUI, still doesn't build yet.