Merge pull request #32 from Hot-N-Seek/ivan

change some views looks
fixed minor issues
Merge pull request #33 from Hot-N-Seek/cameronh

fixed minor issues