ENHANCEMENT: Add a more robust layout solution