working implementation
layout improvements