modifying show
basic modification of style
fixed merge conflicts
Merge pull request #80 from JYoung217/ui_layout

Ui layout