Added layout improvement