Changed meny style
Code clean up