Updated forms

Signed-off-by: Dave <davidajberner@gmail.com>
Tidied header bar

Signed-off-by: Dave <davidajberner@gmail.com>