Actually solved layout issues after all