save changes, mostly style changes

Signed-off-by: Kien Luu <kienluu@kien56.local>
more style changes

mostly menu style changes

Signed-off-by: Kien Luu <kienluu@kien56.local>