tweeked lights and change state order
moved menu buttons