Some layout enhancement
more changes and enhancement