Layout improvements using partial and tables