Fix layout & appearance