Improve performance
Improve style
Added menu navigation