Menu improved and Password windows add to