fix layout issues once and for all