Navigation further improved and Support controller added