improv: final layout