Removed ugly space in popout windows and cleaned up some XML