better interface

No background code changed
Fixed Navigation