v2.0

Organize the code
remove box, use only grid, remove focus
Re-add Settings button in better place
Make it look better & remove settings button for now