Merge pull request #35 from ThatGuyCND/dev

style and layout updates as per OA cases