Fixed UI and form bugs?\