Improving form and button rendering