Updated IntelliJ layout