Code formatting

Signed-off-by: Stephen Cox <stephencoxmail@gmail.com>
ui - Do away with reusing forms

Signed-off-by: Stephen Cox <stephencoxmail@gmail.com>