fixed a few bugs with displaying info
styling changes
styling changes
styling changes
display fixes
stash away
fixing the merge