Some changes on keys, menu and startup files