Working on fixing the layout, Issue #4 is 80% complete.