updated everything
updated ui and lyaout
updated everything
Merge pull request #1 from appmatrixinc/dev

Development