Fix various layout isses