Modernized gem layout