Fixed the dynamic and staic keyword lookups that were messed up because of some confusion in my templates. Tidied up user interface and standardised design element names.