fix user show subscriptions
fixed user show subscriptions
Merge remote-tracking branch 'upstream/master'
updated styling on user show