Merge pull request #28 from lizrush/layout

Layout
fixed category bug and category display
merge category bug fix
working sessions/verification
merge