ua > uk, included bootstrap, refactored models