Brought in layout
Added users
Added soldiers