Form Settings cleanup, CSS improvements