Slight improvement but same cursed layout