dev: better layout