Fix various layout UI