Fix layout issues by reworking