Use selector and special data object attributes in teacup
Refactored layout