Some windows and gui tweaks