style updates
fixed merge conflict on question index, user show