Improve some features design
Improme layout metrics