work in progress (rewrite) , almost there
added .ui files for forms