(feat): added new properties, refactored layout