Fixed form bugs and unified style