fix and improve layout